From 4d493b3a177a77ad31467f44a5bf8777669f22b1 Mon Sep 17 00:00:00 2001 From: "mwilli2@equilibrium.research.intel-research.net" Date: Mon, 23 Feb 2004 15:04:33 +0000 Subject: [PATCH] bitkeeper revision 1.736.2.1 (403a1681ObzkQMYrzhAMAOBqjcQLSA) Support for BLKGETSIZE64 ioctl(). As a side effect, this eliminates some common warning messages the the XenoLinux block device driver. --- BitKeeper/etc/logging_ok | 1 + xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index ea27340633..ec3e92e0bc 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -21,6 +21,7 @@ kaf24@scramble.cl.cam.ac.uk kaf24@striker.cl.cam.ac.uk laudney@eclipse.(none) lynx@idefix.cl.cam.ac.uk +mwilli2@equilibrium.research.intel-research.net rac61@labyrinth.cl.cam.ac.uk rgr22@boulderdash.cl.cam.ac.uk rn@wyvis.camb.intel-research.net diff --git a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c index 883cee38fc..a91ed32a74 100644 --- a/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c +++ b/xenolinux-2.4.25-sparse/arch/xeno/drivers/block/xl_block.c @@ -164,6 +164,11 @@ int xenolinux_block_ioctl(struct inode *inode, struct file *filep, DPRINTK_IOCTL(" BLKGETSIZE: %x %lx\n", BLKGETSIZE, part->nr_sects); return put_user(part->nr_sects, (unsigned long *) argument); + case BLKGETSIZE64: + DPRINTK_IOCTL(" BLKGETSIZE64: %x %llx\n", BLKGETSIZE64, + (u64)part->nr_sects * 512); + return put_user((u64)part->nr_sects * 512, (u64 *) argument); + case BLKRRPART: /* re-read partition table */ DPRINTK_IOCTL(" BLKRRPART: %x\n", BLKRRPART); return xenolinux_block_revalidate(dev); -- 2.30.2